removed some unused variables

* gdk/gdkrgb.c: removed some unused variables

* gtk/gtkclist.c
* gtk/gtkmain.c: #if 0'd out some unused code

* gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug

-Yosh

diff --git a/ChangeLog b/ChangeLog
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ad5cafa65758534813092c9d98d497e3134cfc7c..6cefa1fc32b736579b31c6655d0c2a272814134f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon Aug 24 11:09:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+       * gdk/gdkrgb.c: removed some unused variables
+
+       * gtk/gtkclist.c
+       * gtk/gtkmain.c: #if 0'd out some unused code
+
+       * gtk/gtkobject.c: check for NULL object hash table in gtk_object_debug
+
 Mon Aug 24 02:36:53 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkarg.h:

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 907f9afb773c3a68e5a086a515b918db4295e0af..a4f11de5d9541ba184bf1df9a32bb1abae350cfd 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -2123,7 +2123,6 @@ gdk_rgb_convert_4 (GdkImage *image,
   gint r, g, b;
   guchar *dmp;
   gint dith;
-  guchar pix0, pix1;
 
   bptr = buf;
   bpl = image->bpl;

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index fa74e10b38ae6806874bd3cc6e929a451a763092..8474d8a998bb83f0b04c39dad76b83c2adb106ac 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2083,6 +2083,7 @@ gtk_clist_row_is_visible (GtkCList * clist,
   return GTK_VISIBILITY_FULL;
 }
 
+#if 0
 static GtkAdjustment*
 gtk_clist_get_vadjustment (GtkCList * clist)
 {
@@ -2100,6 +2101,7 @@ gtk_clist_get_hadjustment (GtkCList * clist)
 
   return gtk_range_get_adjustment (GTK_RANGE (clist->hscrollbar));
 }
+#endif
 
 void
 gtk_clist_set_policy (GtkCList * clist,

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 2d674765631297788b6d0198db4b2d929216a80b..28ecb3410f455875b780f3da907c4a76b1e5fae6 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -116,10 +116,12 @@ static void  gtk_handle_idle               (void);
 static void  gtk_handle_timer           (void);
 static void  gtk_propagate_event        (GtkWidget          *widget,
                                          GdkEvent           *event);
+#if 0
 static void  gtk_error                  (gchar              *str);
 static void  gtk_warning                (gchar              *str);
 static void  gtk_message                (gchar              *str);
 static void  gtk_print                  (gchar              *str);
+#endif
 
 static gint  gtk_idle_remove_from_list    (GList               **list, 
                                           guint                 tag, 
@@ -1788,6 +1790,7 @@ gtk_propagate_event (GtkWidget *widget,
 }
 
 
+#if 0
 static void
 gtk_error (gchar *str)
 {
@@ -1898,4 +1901,4 @@ gtk_print (gchar *str)
   if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show (window);
 }
-
+#endif

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index f8f1d4e2e85aef19e85e7a08c27232218fd474d1..d65aeea23ac3c677482593684024abf997e87878 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -105,7 +105,8 @@ gtk_object_debug_foreach (gpointer key, gpointer value, gpointer user_data)
 static void
 gtk_object_debug (void)
 {
-  g_hash_table_foreach (living_objs_ht, gtk_object_debug_foreach, NULL);
+  if (living_objs_ht)
+    g_hash_table_foreach (living_objs_ht, gtk_object_debug_foreach, NULL);
   
   g_message ("living objects count = %d", obj_count);
 }